Слот и небольшая система для носков. Включая 31 новый вид их расцветки. #241
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Mr0maks
reviewed
Sep 13, 2023
Mr0maks
requested changes
Sep 14, 2023
Mr0maks
requested changes
Sep 15, 2023
Resources/Prototypes/Entities/Clothing/Under/will be filled out when implemented -S.txt
Outdated
Show resolved
Hide resolved
Mr0maks
requested changes
Sep 15, 2023
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
Outdated
Show resolved
Hide resolved
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 0b652a5 merging into 558ca9c Resources/Textures/Clothing/Under/Socks/bee.rsi
Resources/Textures/Clothing/Under/Socks/ace_knee.rsi
Resources/Textures/Clothing/Under/Socks/ace_norm.rsi
Resources/Textures/Clothing/Under/Socks/ace_thigh.rsi
Resources/Textures/Clothing/Under/Socks/azure_knee.rsi
Resources/Textures/Clothing/Under/Socks/azure_norm.rsi
Resources/Textures/Clothing/Under/Socks/azure_thigh.rsi
Resources/Textures/Clothing/Under/Socks/bee_knee.rsi
Resources/Textures/Clothing/Under/Socks/bee_norm.rsi
Resources/Textures/Clothing/Under/Socks/bee_thigh.rsi
Resources/Textures/Clothing/Under/Socks/black_knee.rsi
Resources/Textures/Clothing/Under/Socks/black_norm.rsi
Resources/Textures/Clothing/Under/Socks/black_thigh.rsi
Resources/Textures/Clothing/Under/Socks/blue_knee.rsi
Resources/Textures/Clothing/Under/Socks/blue_norm.rsi
Resources/Textures/Clothing/Under/Socks/blue_thigh.rsi
Resources/Textures/Clothing/Under/Socks/cap_knee.rsi
Resources/Textures/Clothing/Under/Socks/cap_norm.rsi
Resources/Textures/Clothing/Under/Socks/cap_thigh.rsi
Resources/Textures/Clothing/Under/Socks/centcom_knee.rsi
Resources/Textures/Clothing/Under/Socks/centcom_norm.rsi
Resources/Textures/Clothing/Under/Socks/centcom_thigh.rsi
Resources/Textures/Clothing/Under/Socks/creepy_knee.rsi
Resources/Textures/Clothing/Under/Socks/creepy_thigh.rsi
Resources/Textures/Clothing/Under/Socks/cyan_knee.rsi
Resources/Textures/Clothing/Under/Socks/cyan_norm.rsi
Resources/Textures/Clothing/Under/Socks/cyan_thigh.rsi
Resources/Textures/Clothing/Under/Socks/fishnet_full.rsi
Resources/Textures/Clothing/Under/Socks/fishnet_knee.rsi
Resources/Textures/Clothing/Under/Socks/fishnet_thigh.rsi
Resources/Textures/Clothing/Under/Socks/furr_knee.rsi
Resources/Textures/Clothing/Under/Socks/furr_norm.rsi
Resources/Textures/Clothing/Under/Socks/furr_thigh.rsi
Resources/Textures/Clothing/Under/Socks/green_knee.rsi
Resources/Textures/Clothing/Under/Socks/green_norm.rsi
Resources/Textures/Clothing/Under/Socks/green_thigh.rsi
Resources/Textures/Clothing/Under/Socks/grey_knee.rsi
Resources/Textures/Clothing/Under/Socks/grey_norm.rsi
Resources/Textures/Clothing/Under/Socks/grey_thigh.rsi
Resources/Textures/Clothing/Under/Socks/holyday_knee.rsi
Resources/Textures/Clothing/Under/Socks/holyday_thigh.rsi
Resources/Textures/Clothing/Under/Socks/homelander_knee.rsi
Resources/Textures/Clothing/Under/Socks/homelander_norm.rsi
Resources/Textures/Clothing/Under/Socks/homelander_thigh.rsi
Resources/Textures/Clothing/Under/Socks/hop_knee.rsi
Resources/Textures/Clothing/Under/Socks/hop_norm.rsi
Resources/Textures/Clothing/Under/Socks/hop_thigh.rsi
Resources/Textures/Clothing/Under/Socks/hos_knee.rsi
Resources/Textures/Clothing/Under/Socks/hos_norm.rsi
Resources/Textures/Clothing/Under/Socks/hos_thigh.rsi
Resources/Textures/Clothing/Under/Socks/hotpink_knee.rsi
Resources/Textures/Clothing/Under/Socks/hotpink_norm.rsi
Resources/Textures/Clothing/Under/Socks/hotpink_thigh.rsi
Resources/Textures/Clothing/Under/Socks/monochrome_knee.rsi
Resources/Textures/Clothing/Under/Socks/monochrome_norm.rsi
Resources/Textures/Clothing/Under/Socks/monochrome_thigh.rsi
Resources/Textures/Clothing/Under/Socks/orange_knee.rsi
Resources/Textures/Clothing/Under/Socks/orange_norm.rsi
Resources/Textures/Clothing/Under/Socks/orange_thigh.rsi
Resources/Textures/Clothing/Under/Socks/pantyhose.rsi
Resources/Textures/Clothing/Under/Socks/pink_knee.rsi
Resources/Textures/Clothing/Under/Socks/pink_norm.rsi
Resources/Textures/Clothing/Under/Socks/purple_knee.rsi
Resources/Textures/Clothing/Under/Socks/purple_norm.rsi
Resources/Textures/Clothing/Under/Socks/purple_thigh.rsi
Resources/Textures/Clothing/Under/Socks/rainbow_knee.rsi
Resources/Textures/Clothing/Under/Socks/rainbow_thigh.rsi
Resources/Textures/Clothing/Under/Socks/red_knee.rsi
Resources/Textures/Clothing/Under/Socks/red_norm.rsi
|
…station-14 into socks
Mr0maks
approved these changes
Sep 16, 2023
AruMoon
requested changes
Sep 16, 2023
Resources/Prototypes/Entities/Clothing/Socks/base_clothingsocks.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
Outdated
Show resolved
Hide resolved
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
AruMoon
approved these changes
Sep 16, 2023
AruMoon
merged commit d994b53
into
Workbench-Team:arumoon-server
16 of 17 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
О запросе слияния
Добавляет отдельный слот для носков, и 31 разновидность расцветок носков, включая по 2-3 вида их длинны для каждой расцветки(В общей сумме 85 новых носков). Все носки добавлены в Шкафы отделов, Локеты глав, а так же в экипировку всех должностей. Вид носков может изменяться от выбора одежды (Юбка-Комбинезон/Комбинезон).
Почему / Баланс
В игре имелись носки, но их слой отображения был сломан, отображаясь по верх юбки-комбинезона. Я решил исправить данную проблему, добавив под носки отдельный слот, имеющий свой слой. В добавок, решил разнообразить игру новыми видами носков, и небольшими фишками что с ними связаны.
Медиа
Чейнджлог
🆑 Tamioki